Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[e1031] replace host check command in celestica e1031 #18279

Conversation

Xichen96
Copy link
Contributor

@Xichen96 Xichen96 commented Mar 6, 2024

Why I did it

The original host check command docker will hang indefinitely when it is run too early in the boot process, halting determine-reboot-cause and lldp/pmon/snmp service from starting. Replace docker with checking /.dockerenv existence.

Work item tracking
  • Microsoft ADO (number only): 27085874

How I did it

Replace docker with checking /.dockerenv existence.

How to verify it

Manually modify image and reboot to see if everything work

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

202305.18

Description for the changelog

Replace host check command for celestica e1031

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@Blueve
Copy link
Contributor

Blueve commented Mar 7, 2024

ADO 27085874

return True for host and False for docker
"""
docker_env_file = '/.dockerenv'
return os.path.exists(docker_env_file) is False
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change: os.path.exists(docker_env_file) is False -> not os.path.exists(docker_env_file)

@yxieca yxieca merged commit c66acd9 into sonic-net:master Mar 7, 2024
19 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Mar 7, 2024
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202311: #18298

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #18309

sonic-otn pushed a commit to Weitang-Zheng/sonic-buildimage that referenced this pull request Mar 11, 2024
@mssonicbld
Copy link
Collaborator

@Xichen96 cherry pick PR didn't pass PR checker. Please check!!!
#18309

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants